From: Kenichi Handa <handa@m17n.org>
Date: Tue, 13 Dec 2011 23:35:52 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~733^2~13
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3343f481d458bdddcf36acb8c8ec0ec6cef0ec16;p=emacs.git

merge trunk
---

3343f481d458bdddcf36acb8c8ec0ec6cef0ec16